package com.java.test;

class hellogit{
   public void hello(){
       System.out.println("Hello Git!");
<<<<<<< HEAD
       System.out.println("This is the second line");
       System.out.println("This is the third line");
=======
       System.out.println("This is the second line");
>>>>>>> conflict
   }
}
